bitkeeper revision 1.1485 (428df22fkTwCIupDtELAwUuLnujDkQ)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 20 May 2005 14:20:31 +0000 (14:20 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 20 May 2005 14:20:31 +0000 (14:20 +0000)
commit505e1e605341aef86f1e747d9a4bbe992d2535e0
treea7f83b30939ec923f195fe4f9ce2170216b74f4b
parent32a640dbd513fae2c7579ffc834126ebc7f00fc2
bitkeeper revision 1.1485 (428df22fkTwCIupDtELAwUuLnujDkQ)

Manual merge.
linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c